Merge changes I62c58967,I1dd57fa2 am: 20e39131c9 am: 72b557ac6a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I216766fc245cdefacda920dcdde56c0d50f6d6b6