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

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

Change-Id: I8c7c767ac65ff8f01ef29a5f4d7a4374a40a62d6