Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into...

Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into udc-d1-dev-plus-aosp am: ad59f779 am: 2b1fcf52

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



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