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