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