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