Merge changes from topic "am-36bdf5682c8d45d1b2598533ab882f2d" into...

Merge changes from topic "am-36bdf5682c8d45d1b2598533ab882f2d" into udc-qpr-dev-plus-aosp am: 3113c210

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



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