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

Merge changes from topic "am-b90859b388c34c15b480cf2da68ac051" into udc-dev-plus-aosp am: 16cdedd1 am: d25992e3

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



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