Merge changes from topic "am-7d13f9b473c743eaae369a3946da2a24" into...

Merge changes from topic "am-7d13f9b473c743eaae369a3946da2a24" into tm-qpr-dev-plus-aosp am: bc58cdf2

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



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