Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 256de04464 am: 3942491a7f am: e492441e16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447 Change-Id: I3c0b1cc78d6794cf3cb3982e7326a40dd6cf0307
This commit is contained in: