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

Change-Id: I3d008d2633785d74a560b7832158caadc4eef8bc