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

* changes:
  fix: Update import path for androidx.test
  Merge QP1A.190404.001