Merge "[Ravenwood] Add "--strip-mockito" to Ravenizer" into main am: 512055521f

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

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