Merge "Limit length and number of MIME types you can set am: 3ae3406b am:...

Merge "Limit length and number of MIME types you can set am: 3ae3406b am: d47de97f am: bcd7713f am: b160218b am: 57d99cca am: a370b4a4" into udc-dev am: 502d72fc

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



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