Merge changes Idadf8487,I84d87024 am: e489d46b7c am: 43b7ae19fb

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

Change-Id: I38ae0b28716a446c9d30a3fbcf7517d0c74e3d30