Merge changes from topic "am-9133789c405d40309ee5fd09c8a75e13" into...

Merge changes from topic "am-9133789c405d40309ee5fd09c8a75e13" into tm-qpr-dev-plus-aosp am: c376a14d

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



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