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

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

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