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