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: c481752b am: 6bafe542 am: 27171f5f

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



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