Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634
am: 77d3f2ec14
am: 78dcb67cf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912 Change-Id: I8dd8485f757d148cdc27b6bebc0db622c0091056
This commit is contained in: