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

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

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