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

Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f1 am: 5bf683e8

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



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