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