Merge "attempt to run protologtool-tests as unit tests" am: f9e2a9c55a am: 8ae5fd7f1c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49f25cdd28d45d453a96b416011d6fd4c65f54a5