Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a am: aa63f727d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: Ia8e767643d5449fc5450e47ce9b22081ae6998d3