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