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