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

Change-Id: I31ef3b4c169fdbbbcc320564d41bc33c6f6f2a82