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

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

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