Merge "Only add logcat to dropbox entries on userdebug/eng builds" into...

Merge "Only add logcat to dropbox entries on userdebug/eng builds" into udc-dev am: 8086da9d am: fecad34f

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



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