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