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