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