Merge "Fix a bug where error count was reset before returning it." into tm-dev...

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

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



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