Merge "Ignore resources from unknown types" am: e0f44eb6e7 am: a4bb7ab3b4 am: fda617812b am: 2a2720593f

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

Change-Id: I08a89f035d241fa0ecc1aaf81c5e37b136a5cf8b