Merge "Add dropbox entries as files to dumpstate ZIP." am: 7572f7bbd2 am: 643a91814d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2422939

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