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: 716a1dd7

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



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