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

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

Change-Id: Ic1e66f3d05328186504f96c9a662644c02dc6230