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