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

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

Change-Id: If357bddcc79e7060981a4d3e9f9e733f1af23826