Merge "shim: check subevent for advertising module" am: 5b84e479 am:...

Merge "shim: check subevent for advertising module" am: 5b84e479 am: 8383073f am: feec8003 am: dd5a546d

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1498303

Change-Id: I1a8a9c9fb35beabe0790a59b4e335a0ad23b7f5a