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