Merge "Fix race condition in rememberPageStateFixed" into udc-dev am: 78ef8cae am: 5449918f am: d40b45b1 am: b318fe93

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



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