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