Merge "frameworks/base: Add APCT tests to the device-tests suite."