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

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



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