Merge "Add @TestApi to brightness @SystemApis"