Merge "Change generic container ids to be more specific" into sc-dev am: ca5c2080 am: d31dd052

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14370816

Change-Id: I650dd3f2ef82be5aab575af719e507d7f1584df4