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