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: 4ad6cb08

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

Change-Id: I1721c92fd7cf0f277d2f5d5b2df020c2e5c55b55