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