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