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