Merge "Remove dev recorder information from event log" am: ab810ba161 am: 89dfc37159

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

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