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

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



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