Merge changes I490ad424,I92ae38b8,I5db49dd2 into sc-dev am: 4a0a03f0e4
am: 0a8fcd8fe9
am: ee1cb6a1cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14840764 Change-Id: Iafe1be9ca695bc3aacc2fe116330439154fb375e
This commit is contained in: