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

Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e am: e8887ee6 am: 6ff218c0

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



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