Merge changes from topic "QP1A.181202.001" into q-keystone-qcom-dev

* changes:
  Prevent com.android.bluetooth crash
  Fix build errors and revert bb568c079b307740cc516528d783934419a99349
  Revert 'Metrics: Add Bluetooth address obfuscator in Java'
  Merge QP1A.181202.001