Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541 Change-Id: Id45fdf5085bcbf49084accf95ffe46098668b74d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>