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