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