Merge changes I99fb2ed2,Iba18bfab into sc-dev am: d2c4944cbb
am: 575ae9574e
am: fbd46dc79e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14823310 Change-Id: I8de2a485c8f8472b444f8e3a9aeb3dc1479d1a44
This commit is contained in: