Merge "Guard mRearDisplayPendingOverrideRequest with mLock" into udc-dev am: ee7b95326c

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

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