Merge changes from topic "am-17f313b4188b4552a71d909dfdf1d548"

* changes:
  Merge "[automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a am: 125630da -s ours am: 393bdb43 -s ours" into tm-qpr-dev-plus-aosp am: 33f319f0 -s ours
  [automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a am: 125630da -s ours am: 393bdb43 -s ours am: 1826f74d -s ours