Merge "Explicitly discard released proto strings." am: 5df912d6 am:...

Merge "Explicitly discard released proto strings." am: 5df912d6 am: fac256f5 am: 1dfaa756 am: c7f43f97 am: b123c446

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



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