Merge "Handle Resources$NotFoundException in NoHomeObserver." into nougat-mr1-cts-dev am: 469c71a770 am: 5ad101177e
am: 207c8112e8

Change-Id: I87483a491e351fcdd9d123c07373638c4be5ff8f