Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into...

Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-dev am: 652b9f46 am: 8a8aebe5

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



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