[automerger skipped] Merge "Merge "Check for null HAT and add logging" into rvc-dev am: 90b27662 am: 6fdc18ad" into rvc-d1-dev-plus-aosp am: 158066f7 am: 9f21c36e -s ours

am skip reason: Change-Id I7dfe5dd8e740eef0fc74cd2e68a19dc35eb2c49e with SHA-1 a603a300 is in history

Change-Id: I744e074da90157a33b5a6530487fd2914097f14f