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