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

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

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