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

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



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