Merge changes Idadf8487,I84d87024 am: e489d46b7c

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

Change-Id: I4ee8583862f590206240d107d9a2a509edea03df