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