Merge "Guard mRearDisplayPendingOverrideRequest with mLock" into udc-dev am: ee7b9532 am: 37486f59

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



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