[automerger skipped] Merge "Disable wtf dropbox entries by default." into...

[automerger skipped] Merge "Disable wtf dropbox entries by default." into udc-dev am: bf1e1425 am: 816c9b42 -s ours

am skip reason: Merged-In Ia678215c34df6ba9a354b3011a90f8f445c493b2 with SHA-1 e39fa827 is already in history

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



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