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