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