Merge changes from topic "am-bd02cec51a7c47dda2adc777e3666a7c" into...

Merge changes from topic "am-bd02cec51a7c47dda2adc777e3666a7c" into tm-qpr-dev-plus-aosp am: e0600ae0

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



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