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