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