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