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