Merge changes from topic "am-25d5d76ca46e4430a3b3dfa6bff0dfdc" into...

Merge changes from topic "am-25d5d76ca46e4430a3b3dfa6bff0dfdc" into udc-qpr-dev-plus-aosp am: 4f57ccdd

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



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