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