[automerger skipped] DO NOT MERGE Update bottom huns container to use HeadsUpContainerView am: 20549dfe49 am: cd26d5dbb5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3fe5528b68d5fc10cae636f44a49eb2cd4f1dd6c