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