Merge "RESTRICT AUTOMERGE FRP bypass defense in App battery usage page" into tm-qpr-dev