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

Merge changes from topic "am-e14628239ffa4a58a651e0356d76018c" into udc-qpr-dev-plus-aosp am: cbd6b117

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



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