Merge "Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev...
Merge "Merge "Add common tests for FrameworksBaseTests and CTS" into qt-dev am: e945aa8b" into qt-dev-plus-aosp
am: 20f935ea
Change-Id: I3d7855839bf19b4481295d8cd1c7f55a192f936d