Merge "Fixing circular dependency" am: 37673f0bf5

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

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