Merge "Move page count to rememberPagerState" into udc-dev-plus-aosp am: 44609502 am: 475c18ff

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



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