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