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