Merge "Use 28.txt as API file for migrating NULLs in Metalava" am: 2495ca3c29
am: 7aa98ce2b0

Change-Id: I8f7f9df6d0aa553e722912e05639b252a6c657bf