Merge "Fixing circular dependency" am: 37673f0bf5 am: 05bfd352be

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

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