Merge "Fix a bug where error count was reset before returning it." into tm-dev am: 1b819932 am: fbe145bc

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



Change-Id: I46da66eca5f74aef6a996141f84d1a9e5cd458f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>