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