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