Merge "Makes Activity.addDumpable() a @TestApi"