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