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