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