Merge "CTS secondary_user: CtsAndroidTestBaseCurrentApiSignatureTestCases" am: 89c37d9bde
am: 836f368a97

Change-Id: I468c7769bc710a126fa6b1a7d1a76c699b780839