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