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

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

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