[automerger skipped] Merge "[GraphicsEnvironment] Avoid null access." am: 393215e245 am: 181ff65039 -s ours am: 60cc40c831 -s ours
am skip reason: Change-Id I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff with SHA-1 d22eebefdb is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530839
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide16650f8d246620eae80e56a073daade1617a2c
This commit is contained in: