Merge "Remove HotseatEduActivity from AOSP" into sc-qpr1-dev