Merge "Move page count to rememberPagerState" into aosp-main-future am: e8a2bcbdb2 am: f3decd9921 am: 7317c15ec0

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

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