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