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