Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef am: af29a157db am: 0b9260031d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91781bbb80f03df2a4927b8aa9fe530d6d62ce31