Merge "Removing is_retrofit code path" into main am: ad1ee13cec am: 2d7242c30b am: 94483ea63a am: 295b6833b0 am: 13113929d4

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

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