Merge "Fixing circular dependency" am: 37673f0b am: 05bfd352 am: 7d9cfa48

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



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