Merge "Change generic container ids to be more specific" into sc-dev am: ca5c208082 am: d31dd05220 am: 361754c4b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14370816 Change-Id: I8c34abe2b1068e8d7d8d1574a6b2e80de6073869
This commit is contained in: