Merge "DO NOT MERGE Update bottom huns container to use HeadsUpContainerView" into rvc-qpr-dev am: 7e4dc690c6

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

Change-Id: I651d1d5b047b4560bcc8d370062dfc438547c574