Merge changes from topic "rear-display-qpr" into tm-qpr-dev am: 51d289b7 am: 525db3b6

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



Change-Id: Ic7ca68b963d04f6d1f60ef0cb10ff94a85dcca5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>