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