Merge "DO NOT MERGE Update naming for the AlternateBouncer" into tm-qpr-dev-plus-aosp