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

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



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