Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: 0e37bc27a2

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

Change-Id: I72ec88755fd1d41d47d2850f6b7bc33de49601c1