Merge changes from topic "am-6459b40aaee14eccad6ccceaf3ffb2fe" into tm-qpr-dev-plus-aosp am: 439ca75c

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



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