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

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

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