Merge "Add dropbox entries as files to dumpstate ZIP." am: d63b06b4 am: 4c3ff4d9

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



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