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