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

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

Change-Id: I8414859c6142c59c3eb78939ee0ad12b9549f01a