Merge changes I5989a67e,I30a77bd6 into sc-dev am: c24caeb4f8
am: a2e9d4d129
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14649896 Change-Id: Ib0989a965d694b6896c10f71864c8de5484375bd
This commit is contained in: