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

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

Change-Id: I83f47442f858a736d9e8a32c8cddbb28d19e7b32