Merge "Guard mRearDisplayPendingOverrideRequest with mLock" into udc-dev am: ee7b9532 am: 568b400a am: a66005f9 am: e96085f5

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



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