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

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

Change-Id: I35c3a5e629ee537d127edef24200985fa0038b0b