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