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

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



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