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

Change-Id: I9e1343b1878e73ebb6a83ac4c8a4436d6846baf1