tree 9fc80953f3372d2cab80e58eb0ad5a0a0c5f149b
parent 3a518abaf881925ed66f2c00e241697164a59873
parent bc628e96249b2cfc38015b97d7d8e12afc37da1d
author Myles Watson <mylesgw@google.com> 1556770029 -0700
committer android-build-merger <android-build-merger@google.com> 1556770029 -0700

[automerger skipped] [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceType" am: 903b0f6313 am: 32fb537700 am: 5039e3df88 am: dfca097027 skipped: 01143285bf am: 6dd7bb0e75 am: 527fc68bc6 am: 7ef7414f96 -s ours
am: bc628e9624 -s ours
am skip reason: subject contains skip directive

Change-Id: I146d27834d92fcf50b642b172ec25f211e4ca26b