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