Merge "parse subevent correctly, avoid nullpointer exception" into main am:...

Merge "parse subevent correctly, avoid nullpointer exception" into main am: d9331ab8 am: 77fd8ba9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3501859



Change-Id: I446d74c416aac71145c2056b46988cb6fba9bac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>