Merge "Revert "Update the ambient indication container"" into sc-v2-dev am: 300d2286c1 am: a77c86905a

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

Change-Id: I8621e2eddaabc3a46b351fee3e28f47c876c9874