Merge "Guard mRearDisplayPendingOverrideRequest with mLock" into udc-dev am: ee7b9532 am: 8eedc832

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



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