Merge "0->nullptr." am: 279589cbc3 am: 88cf4b21ae

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1700334

Change-Id: I23ace3bde76e053fbe69caab0ec15f03ac0a57f7