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

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



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