Merge changes from topic "am-4ed6458f15384f4ea438ed36c18a36d9" into...

Merge changes from topic "am-4ed6458f15384f4ea438ed36c18a36d9" into udc-qpr-dev-plus-aosp am: 2517c5f4

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



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