Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48

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

Change-Id: I4a4c7bd80496a8fa883c895080d4d4c48a3fa3e9