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

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



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