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