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

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



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