Look up proto type definitions separately am: 9c93e69a4f am: c0c91f8e13

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

Change-Id: I4c4c40d24ba1b9fd4fdb2c8e077cc046f11cbf9a