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