tree 0cf7a961457363f2cab9493dbb74f6f1ea337d9a
parent 2b874d98deb3ad3f84a0732899eced9312300ea1
parent d854e0f5f2ae24e010c2f7db4cb9d15072c69ca0
author Anthony Chen <ajchen@google.com> 1560988014 -0700
committer android-build-merger <android-build-merger@google.com> 1560988014 -0700

Merge "Update unlock code to expect token and handle in a single packet." into qt-dev am: 029a562bd8 am: 6b6bc34c47
am: d854e0f5f2

Change-Id: I6150d6d3f9a524bf6f79555e5575ca146fd717f8