Merge "Merge "Remove hotseat edu flag" into rvc-dev am: d6cd14d179 am: e65a33134d am: 9b607eaaee" into rvc-qpr-dev-plus-aosp