Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea am: 5d3e33badf

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

Change-Id: I9fd80cfe34f34ba99e35e3c6c5d1da411caf2668