Merge "Make sure loading extra info once" into tm-dev am: 14d31677

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



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