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