Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2

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

Change-Id: I0431e3135de7bb952fa8e8185b6eef44a1c24dc7