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

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

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



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