Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into...

Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into udc-qpr-dev-plus-aosp am: 5fbadb8f

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



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