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

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

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