tree 979aa49f58936172943989520396491cf6dd8bc5
parent 7ff97d770365db46446de643cb1004155a1851c8
parent d62def70c74d19002d148f9abbc143bc88d45b4e
author Hugh Chen <hughchen@google.com> 1609989780 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609989780 +0000

[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8 -s ours am: d6bc0a328f -s ours am: 5036eee733 am: 535f5ba053 -s ours am: d62def70c7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9c9277378921ced9ed919cd9e03811acce59c55