Merge "Add a focused state to the DisplayCutout test buttons." into stage-aosp-sc-v2-ts-dev