Merge "Avoid the exception when UI shows the fragment" into udc-qpr-dev am:...

Merge "Avoid the exception when UI shows the fragment" into udc-qpr-dev am: a94cfc7b am: a4cac90c

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



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