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