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