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