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

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

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