Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev am: e3cf049039 am: 7872258e40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209651 Change-Id: I168c02357d69fed3eb4ab7a890f5ddb24d66b9e9
This commit is contained in: