Merge "Revert "Shove type into source_info"" into main am: d6fe3032 am:...

Merge "Revert "Shove type into source_info"" into main am: d6fe3032 am: d69ab5d9 am: 9c9b7daa am: 9089d658 am: 7aafe56a

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



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