Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
am: af29a157db
am: 0b9260031d
am: a294dac526
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8cf49da12694d8aa84ee72b6712539a0142610a8
This commit is contained in: