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: 2e707d11 am: 869953ba

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



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