[automerger skipped] Merge "DO NOT MERGE Update bottom huns container to use HeadsUpContainerView" into rvc-qpr-dev am: 7e4dc690 am: f8d84db0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I94b8e5dcca2467cc85003cf5ebc2aa73c6c0de3f