Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102 am: fa58b7e292

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68dd01db1ee41b4baf09338872edc8599d892f96