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: c731759d

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

Change-Id: Ife123b0ecd73ea704622354d8391c903b27ae7f4