Merge "Enable vendor error/acquire messages on user build" into sc-dev am:...

Merge "Enable vendor error/acquire messages on user build" into sc-dev am: b7020910 am: 76dfedc1

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

Change-Id: I5c2e67e6cb808d42e72d7ea4931c39e106f6d5ab