Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into...

Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f1 am: 61c166f2

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



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