Merge "Consistently say "Available since API level"." am: 2218ec1a22 am: 22cd27bcc5
am: 8a58e72823

Change-Id: Ie955a04f48091716a1cb5169444a84797f1ef76f