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

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



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