[automerger skipped] Merge "Attempt to run error_prone_android_framework_test...

[automerger skipped] Merge "Attempt to run error_prone_android_framework_test as unit tests" into sc-dev am: b6ada90d -s ours

am skip reason: Change-Id I9c0b93d6e6eb0b97ff96b1ac7c02d4525b762bd6 with SHA-1 b8c9a05a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8dc604c3402254113942e485e0205f9e791167e3