Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b am: d5ff766ed8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I298f46dd7e44e63141b91ccdd67ea7ebbefc9015