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