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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf935ec22f8f61936be068b4771af406ae56599b