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

Change-Id: Ic78ff947250871fa773252c924f1dee9395c6074