Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
am: fee443bfab

Change-Id: Ie2a6b0bb46ea6275cb2af0ef006472daf5e80b14