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

Merge "Make sure loading extra info once" into tm-dev am: 14d31677 am: cb652d47 am: 33e4d8dc am: 54891b0c

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



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