Merge "Shove type into source_info" into main am: a3646037 am: 4833be35...

Merge "Shove type into source_info" into main am: a3646037 am: 4833be35 am: a961ebc2 am: 296e0773

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2775834



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