Merge "Moving logging include" am: 729c159744 am: babdb7b2c4 am: 953af4ca8f

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

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