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