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

Change-Id: Id51b64c8afea2a19e3fe2ad2363fd6b234c35825