Merge "Convert type_queue to a member of AbiDiffHelper" am: feab6687e7

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

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