Merge "Fix pager state after configuration change" into udc-dev am: ee760d7e am: d1558147 am: b61fff84 am: 650317df

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



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