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