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

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



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