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