Merge "Merge "Fix clipping of an app badge on bubbles in overflow" into tm-qpr-dev am: a6e03b00" into tm-qpr-dev-plus-aosp