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