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

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

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



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