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

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

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