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

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



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