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

Change-Id: Ie36d064efd7913a3a921dd1f5fb57d3c0d68b8c5