Merge "Fix pager state after configuration change" into udc-dev am: ee760d7e am: 7f81caeb am: f8db9ee4 am: fb914257

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



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