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