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