Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into...

Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev am: 76774d92 am: 4ec41917 am: 8bbcb0d5

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



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