Merge "Move hidden API warnings into resolvers" am: 70e88d6df6
am: 8c0c03fc51

Change-Id: Id0970d613722756fc85ee2a79e9d2914b7b209db