tree 0cf7a961457363f2cab9493dbb74f6f1ea337d9a
parent f9e4ae68c7eff1f3c08a496c20d8b9a2226b0bdb
parent 6fb4620d23418747cfd93a7c2ec71669dbc86190
author Anthony Chen <ajchen@google.com> 1560987206 -0700
committer android-build-merger <android-build-merger@google.com> 1560987206 -0700

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

Change-Id: Ic90119501ce12f0a15354804615eac19091787af