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

Merge changes from topic "am-b56b85ea3c0d4196a832257fbcf9a961" into udc-dev-plus-aosp am: d6c0b319 am: 6cd7393a

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



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