Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
am: 54f47d0953
am: 16e8c4783e
am: 85410254c7
am: 872093e29d
am: cd1451ce53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447 Change-Id: I53e540958fb0c290738a5ac3a1fe6b7a44fb592b
This commit is contained in: