Merge "Refactor pseudo-crate code into struct and methods." into main am: 9657317ab9 am: 95d3a5906c

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

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