Prevent against NPE inside ComponentKey

b/31063280

Change-Id: I71254fc1a3244fd6834ebf65923d194f17afc1ba
2 files changed