Merge changes from topic "presubmit-am-8af453bc60ad46b9962a87ee16b946bc" into tm-dev am: 5a547fc1

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



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