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

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

Change-Id: Idc07f93430ab702e256919a53bf07d523d373652