Merge "Update the ambient indication container" into sc-v2-dev am: 27bce90759

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

Change-Id: Iee94dd1c5d9bac9c302ffbddb822f6a51b60922b