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