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