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