Merge "DO NOT MERGE, re-apply, Adjust testAppFailAccessPrivateData to fail on non-tagged sockets" into lollipop-mr1-cts-dev
am: 24f2268a55  -s ours

Change-Id: I62ae29964402b4273dda70007a2dc2761803f289