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

Change-Id: I863ffea6358a353986cee7b1c76622c434310bba