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