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

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



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