Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4
am: 0a8fcd8fe9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764 Change-Id: I8fe00b5cb6d9678b1dd203e528e5099cff95029d
This commit is contained in: