Merge changes I9dea35a7,Iddcc0a65 into sc-dev am: bcc288e801 am: ecef0cd069
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14531459 Change-Id: I14aef39f5b12ab671e29c9d51eb7b36d53ce650d
This commit is contained in: