Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d

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

Change-Id: I868b0e88346f0674998770895a603e292cef4f9f