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 am: 947c974b

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

Change-Id: I0c70579501afd68bc821ac960e56015babdab98c