Merge "Remove dev recorder information from event log" am: ab810ba1 am: 89dfc371 am: 11a772ee

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2183581



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