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