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