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