Merge "Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 am: 2acc8e28dd" into nyc-mr2-dev-plus-aosp
am: 658e1ddc7e

Change-Id: Ibe20b5786d5155d2e319c3c0620d1da64cbe14e6