Merge "Fix crash on TV caused by new iconFactory attrs" into rvc-dev am: 848cfed7 am: c3d018e0 am: 49f96ae3

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

Change-Id: Ib8dc425922795abf361d070cd080f0d99908c3f3