Merge changes from topic "presubmit-am-ae3353ea18c5416f84915ca2bb52d68b" into tm-mainline-prod am: 1c59d5db7a

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

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