Merge "Add common tests for FrameworksBaseTests and CTS"
am: a57e80e60a

Change-Id: I1616831ad8f143298b80ebce9af205f8e50de1f8