Merge "phonewm: reformat ButtonOverridePermissionChecker as per Java style" into main