Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into...

Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da2 am: ff1617a8

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



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