am d029b0a0: (-s ours) am ff02a590: Cherry-pick with modifications: cc: Fix HeadsUpDisplayLayerImpl NPE after resource loss

* commit 'd029b0a0cbde888746df2b3fc0a75269436e9499':