Merge changes I93d4d089,I4f09f9e5 into tm-qpr-dev am: f5a9766041

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

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