Merge "Merge "Merge "Merge "Fix ServiceConnection leak in ProjectionOffscreenActivity" into nougat-cts-dev am: a8a432a184" into nougat-mr1-cts-dev am: 2ea5a39d76" into oreo-cts-dev am: fccf6727e0 am: 489852c136 am: 012d32a60b am: 0ab9f1b6af am: 4613616982"