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

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



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