Merge "Explicitly discard released proto strings in test." am: 4a21587a am:...

Merge "Explicitly discard released proto strings in test." am: 4a21587a am: f429f137 am: c2695ffa am: e4359968 am: b52e5ca6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2239077



Change-Id: I0b2bf36892c1d8e27b79b4bbf2dff141a57db97a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>