Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am:...

Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am: fdc32b76 am: 538990be

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17679969



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