Merge "Removing is_retrofit code path" into main am: ad1ee13cec am: 2d7242c30b

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

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