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