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