Merge changes from topic "rear-display-overlay" into tm-qpr-dev am: 47af12f9 am: f3ed0382

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



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