Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into...

Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into udc-qpr-dev-plus-aosp am: e766e5fd

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



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