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