Merge "Move page count to rememberPagerState" into aosp-main-future am: e8a2bcbd am: f3decd99

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



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