Merge "Replace TypeQueueCheckAndPushBack with TypeStackGuard" am: 78562c0157

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

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