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