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