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