Merge "Update barbet screen decorations" into rvc-qpr-dev am: 25679281e0 am: 0c20798c5f

Original change: https://googleplex-android-review.googlesource.com/c/device/google/barbet/+/13932379

Change-Id: Ifd170a4c6b66d6d4bbe652866b73d931f00b4574