Merge "Omit self_type and referenced_type" into main am: da31a01abb

Original change: https://android-review.googlesource.com/c/platform/development/+/2977014

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