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