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