Merge \\\\\"Revert \\\\\"DO NOT MERGE Adjust testAppFailAccessPrivateData to fail on non-tagged sockets\\\\\"\\\\\" into marshmallow-cts-dev am: 8a6b49102c  -s ours am: aac57fd71c am: e1a3eb7c8a am: c8c11a3350
am: 668c6fe3bb  -s ours

Change-Id: I9e0ea7f2e3345ee2668689ae184eee19481b5d85