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