Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a
am: aa63f727d7
am: 879f4472ec
am: 0d44dd5a0d
am: dd7d5bbc96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316 Change-Id: I17f5f9273bf1382c8f998ba831cc7a3ea7eac684
This commit is contained in: