Merge changes from topic "am-45b9491f655447d7bcbaec243df04490" into...

Merge changes from topic "am-45b9491f655447d7bcbaec243df04490" into sc-qpr1-dev-plus-aosp am: d084b97e am: f894aafd

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

Change-Id: I72b590c9b08839994fc578f7757101826f64bf02