[automerger skipped] Merge "Set default metadata/XML/attribute set value before parsing" into tm-qpr-dev am: a3d8ef13 am: ec3e99bb -s ours

am skip reason: Merged-In I0e9c484fe73141521da42e57c60e6bf722d9744a with SHA-1 68600718 is already in history

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



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