Merge "Set the visibility of framework-core-sources-for-test-mock" am: a77e4c3ad3 am: af31927d4d

Change-Id: Ic3f1fcc6daac3ab2e15d8c96a75372320d5a5104