Update external platform annotations for Nougat am: f479f2b758
am: 093f9a58a6

Change-Id: I26e6e8e3da5a01210420f2bf76f77e18421c08db