Merge changes I16a302b5,I33f2ce58

* changes:
  Migrate frameworks/base/apct-tests/perftests/core to androidx.test
  Introduce TextClassifierEventTronLogger