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