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