tree ec6f922d6b7f4dae971fad421f67ef02eff05b38
parent e6068e22c4c42f5482c9ed5c7a568eea4e93a41f
parent 3d2c759d7c4fe44e49a0329c56392d0dff35507c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578711472 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578711472 +0000

[Garage Mode] Back-port null checks from master am: 3d2c759d7c

Change-Id: Idc3473fcf1cd82c610d09e34bc9d5f3b8d4ed4a3