[automerger skipped] Merge "Ignore resources from unknown types" am:...

[automerger skipped] Merge "Ignore resources from unknown types" am: e0f44eb6 am: a4bb7ab3 am: fda61781 am: 2a272059 am: 1946bfb8 -s ours

am skip reason: Change-Id Ia3c0b4e07457eb8634b5a256ef77270e99b8bd72 with SHA-1 19e1a5b4 is in history

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

Change-Id: Ia63b617d79577267cd76c727c157c31e8c55ca7b