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