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