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

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



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