Merge "Avoid returning decrypted data over binder" into nyc-mr1-dev
am: 2f63815ca2

Change-Id: I1bf01788f89547dcfea59cb2348d00f925a5b0c9