Merge "Clean up comments/logs" am: 02360a55 am: 8f9a356b am: 3197c33f...

Merge "Clean up comments/logs" am: 02360a55 am: 8f9a356b am: 3197c33f am: 72d93034 am: 391b6cdc

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



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