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