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