Merge "Revert^2 "Update the ambient indication container"" into sc-v2-dev am: 4785ec13d0 am: b7dbfbb378

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

Change-Id: I890ad924a97d157a548d66e26211c322be9bb7d7